From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat, 9 Feb 2013 02:02:18 +0000 (-0500)
Subject: searchDisplay: Remove doSearch
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4880
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=569797d7c5c6268128c9ff20cd7adb57516f803f;p=gnome-shell.git

searchDisplay: Remove doSearch

This is nothing but a middle man, as the view selector already owns
the search system. We want to start being a bit more tricky with what
we do with the search system so that we ignore whitespace, so let's
cut the middle-man out now.

https://bugzilla.gnome.org/show_bug.cgi?id=693458
---

diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 9ae993efc..9c6c06314 100644
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -432,10 +432,6 @@ const SearchResults = new Lang.Class({
         this._statusBin.show();
     },
 
-    doSearch: function (searchString) {
-        this._searchSystem.updateSearch(searchString);
-    },
-
     _metaForProvider: function(provider) {
         return this._providerMeta[this._providers.indexOf(provider)];
     },
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index a87c54c53..f2da6d183 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -423,7 +423,7 @@ const ViewSelector = new Lang.Class({
 
     _doSearch: function () {
         this._searchTimeoutId = 0;
-        this._searchResults.doSearch(this._text.text);
+        this._searchSystem.updateSearch(this._text.text);
 
         this._showPage(this._searchPage);
     },